merge trunk
authorKenichi Handa <handa@etlken>
Tue, 13 Jul 2010 06:18:51 +0000 (15:18 +0900)
committerKenichi Handa <handa@etlken>
Tue, 13 Jul 2010 06:18:51 +0000 (15:18 +0900)

Trivial merge